]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
St: Use clutter_actor_get_request_mode
authorAdel Gadllah <adel.gadllah@gmail.com>
Sun, 23 Jan 2011 14:20:43 +0000 (15:20 +0100)
committerAdel Gadllah <adel.gadllah@gmail.com>
Mon, 24 Jan 2011 13:41:52 +0000 (14:41 +0100)
Use clutter_actor_get_request_mode rather than g_object_get
since we have it in the required clutter version.

https://bugzilla.gnome.org/show_bug.cgi?id=640415

src/st/st-private.c

index f4707691e9b8ebe590766adcc3414ba95dc23398..290cdf8333271a6efe501643c62ff706a2523c64 100644 (file)
@@ -49,7 +49,7 @@ _st_actor_get_preferred_width  (ClutterActor *actor,
       ClutterRequestMode mode;
       gfloat natural_height;
 
-      g_object_get (G_OBJECT (actor), "request-mode", &mode, NULL);
+      mode = clutter_actor_get_request_mode (actor);
       if (mode == CLUTTER_REQUEST_WIDTH_FOR_HEIGHT)
         {
           clutter_actor_get_preferred_height (actor, -1, NULL, &natural_height);
@@ -86,7 +86,7 @@ _st_actor_get_preferred_height (ClutterActor *actor,
       ClutterRequestMode mode;
       gfloat natural_width;
 
-      g_object_get (G_OBJECT (actor), "request-mode", &mode, NULL);
+      mode = clutter_actor_get_request_mode (actor);
       if (mode == CLUTTER_REQUEST_HEIGHT_FOR_WIDTH)
         {
           clutter_actor_get_preferred_width (actor, -1, NULL, &natural_width);
@@ -173,8 +173,7 @@ _st_allocate_fill (StWidget        *parent,
    * modified to cope with the fact that the available size may be
    * less than the preferred size.
    */
-  request = CLUTTER_REQUEST_HEIGHT_FOR_WIDTH;
-  g_object_get (G_OBJECT (child), "request-mode", &request, NULL);
+  request = clutter_actor_get_request_mode (child);
 
   if (request == CLUTTER_REQUEST_HEIGHT_FOR_WIDTH)
     {